From 54f3635144e26a928d8efd8de2f089d4d270bfbf Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Wed, 14 Apr 2021 16:50:51 -0500 Subject: [PATCH] Change init_menu() to establish_settings() --- src/pgwui_menu/pgwui_menu.py | 7 ++++--- tests/test_pgwui_menu.py | 12 +++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/pgwui_menu/pgwui_menu.py b/src/pgwui_menu/pgwui_menu.py index fe7a9ba..ad72d7d 100644 --- a/src/pgwui_menu/pgwui_menu.py +++ b/src/pgwui_menu/pgwui_menu.py @@ -1,4 +1,5 @@ -# Copyright (C) 2018, 2020 The Meme Factory, Inc. http://www.karlpinc.com/ +# Copyright (C) 2018, 2020, 2021 The Meme Factory, Inc. +# http://www.karlpinc.com/ # This file is part of PGWUI_Menu. # @@ -27,7 +28,7 @@ DEFAULT_MENU_ROUTE = '/' DEFAULT_MENU_MENU_LABEL = 'PGWUI Menu -- Main Menu' -def init_menu(config): +def establish_settings(config): '''Add default menu information into settings when they are not present ''' settings = config.get_settings() @@ -40,7 +41,7 @@ def init_menu(config): def includeme(config): '''Pyramid configuration for PGWUI_Menu ''' - init_menu(config) + establish_settings(config) config.add_static_view( f'static/{PGWUI_COMPONENT}', 'pgwui_menu:static/', diff --git a/tests/test_pgwui_menu.py b/tests/test_pgwui_menu.py index 0c83b0e..43ce060 100644 --- a/tests/test_pgwui_menu.py +++ b/tests/test_pgwui_menu.py @@ -29,19 +29,20 @@ from pgwui_develop import testing # Unit tests -# init_menu() +# establish_settings() @pytest.mark.unittest -def test_init_menu(): +def test_establish_settings(): '''A menu_label is set ''' with pyramid.testing.testConfig() as config: - pgwui_menu.init_menu(config) + pgwui_menu.establish_settings(config) assert config.get_settings()['pgwui']['pgwui_menu']['menu_label'] \ == pgwui_menu.DEFAULT_MENU_MENU_LABEL -mock_init_menu = testing.make_mock_fixture(pgwui_menu, 'init_menu') +mock_establish_settings = testing.make_mock_fixture( + pgwui_menu, 'establish_settings') # includeme() @@ -52,7 +53,8 @@ mock_scan = testing.instance_method_mock_fixture('scan') @pytest.mark.unittest def test_includeme( - mock_init_menu, mock_add_static_view, mock_add_route, mock_scan): + mock_establish_settings, + mock_add_static_view, mock_add_route, mock_scan): '''add_static_view, add_route, and scan are all called ''' with pyramid.testing.testConfig() as config: -- 2.34.1